From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 16 Jun 2009 15:38:40 +0000 (+0200)
Subject: Merge branch 'topic/ctxfi' into for-linus
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~22017^2~12
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a;p=linux-4.9.git

Merge branch 'topic/ctxfi' into for-linus

* topic/ctxfi:
  ALSA: ctxfi - Fix deadlock with xfi-timer
  ALSA: ctxfi - Replace atc lock to mutex
---

3d2aa66ddaa3008ae2c71bca07eb5e8b08170c4a